Removed a lot of stuff