Remove unused stuff and clean up