Removed remains of the unneed merge