Cleanup. Ready for testing