Moved constants over to Util class
Removed non used import statements