Removed a dead class
Updated copyright and orgainized imports