Cleanup. Removes unused stuff