fixing stuff
removing stuff