Removed code from other pull-requests