Cleaning house, not sure if this is is a good commit, will revert if wrong.