getting rid of old, commented code