Cleanup and removal of unused stuff.