removed the remaining stuff