Bring in some missing setups

Clean up many different things