Fixed up some un-needed things