Starting to refactor this to a shared class
Removing some un-used pieces
Removing more unused log statements/old todos
Cleaning some house!