Cleanup of functions and stubbing out more CRUD