Cleared up the mess in the repository