Remove protected_attributes

bundle up a couple more things