MADS: Initial cleanup of action/player handling