Removed some stuff and junk for now
Refactoring a bit