Removed a lot of shit
Fixed merge