Removed code for old elements