Remove feature detection, update schedule