Remove unneeded mutable keywords