Cleanups, and removed unused projects