Removing timing code