Moved some stuff in main class to constants. Removed some deprecated code.