- removed some obsolete codes