Cleaned up code. Removed relics from ancient times
Merge