Cleaning up WIP code that was failing build