Removed some obsolete imports and comments
Added comment