Cleans some old code