More dev cleanup