simplify spray project
clean up imports