Cleanup - getting ready to fix this project. Removed all broken items.