removed more extra stuff