remove unused code
spaces
remove unused module
Convert basic objects to Moo