Cleaning up unused stuff
Further cleaning