Removed reused UserCommands to make sure they don't cause serialization problems