Removed code that has been refactored elsewhere