More housekeeping, removed code that was commented out