Removed a bunch of unnecessary modules