Returns commas
Removes obsolete imports
Cleans up code