remove unused import, methods... and correct indentation