clean up imports
clean up imports
convert servlets to Unit instead of type parameter
cleaned up warnings