Removed code that doesn't apply to this branch