removed more everything