Removing some unnecessary nested attributes