removes some legacy code from shell ver.