Removed remains from merge