remove unnecessary methods
clean imports
make the compiler generic