getting rid of old slow code