commented old code removed