recommit files more cleanly

Removed extra code, extra files from previous commit.