March cleanup of existing code

[ComputerGhost]

Just go through and clean up the code a bit. Remove stuff that isn't used, reorganize stuff that needs reorganized, et cetera.