Removed completed TODO's and removed unused imports
Merge remote-tracking branch 'origin/feature/cleanup' into develop