I should have cleaned up now that I have removed the old code.