Remove some arel where it is not needed