Refs #11 Cleanup, removed some code that is now in commons