Removed code that's no longer needed