Removing Leap Specific code