Clean up less remnants