removed old forgotten if statement