more cleanup: rakw and warbler only required for development