Cleanup, ready for new implementation