Some cleaning and deleting of deprecated stuff