Removed some stuff from another branch