Removed bad code from merge