removed some gremlins