fixing millis test, cleaning up remove