Back out code that needs to be rewritten