Removed some more things, changed compile flags