Fix .scbClean()
General cleanup