Removed some obsolete commands now