Removed code, updated others