Removed some things to make it compile a lot faster