Remove some unecessary references