Removed interrupt handlers from lib