simplify

ruthlessly simplify systems (delete first, DRY, SSOT, leverage libraries)