Removed a lot of unnecessary stuff