cleaned up leftover stop code