Remove Sentral stuff and clean up some bits and pieces