cleaning up for better build from dev vm