Cleaned after merge