Lost at merge
Clean up code