removed more code