removed legacy codes