Clean up remnants from last approach