Succesful merge and cleanup. MVP