Remove unneccesary comments
Remove imports, add "final"s