clean out legacy code