cleaning up things that shouldnt be here