remove some things that are not working -.-