removed some deactivated source code
removed some deactivated source code