Removed leftover code from merge