Removed unnecessary imports
Tried to get rid of warning. Added TODO comments for warnings I could not trivially fix.
Merge branch 'feature/springCleaning' into develop