further Conch cleanup