lots of code cleanup I left uncommitted for who knows how long