Remove legacy operations, where was unnecessary