Cleaning up warnings + consolidating upgrade to 1.7
Removed unused projects
Use 1.7. reduce warnings