Code cleanup: Remove superfluous "extract"