Removed some stuff that was not in use