Attempting to tidy up the GIT mess I pushed