Cleanup legacy classes update doctrine