Comments changed, were invalid
Removed unused imports