more cleanup, fix -comile