Removing unneeded mutable usages