Cleanup

cleaning up leftovers and changing location of HashTable