Removed a few more things