Removed code parts