removed a few more things