Removed some stuff that were in the wrong places