Removed a couple more things