Cleaned up some stuff that didn't need to be in here anymore