Lots of housekeeping, deleting old, depreciated code and code rage.