Cleanup before implementation