removing hacky things that are no longer needed