Remove some unused things and fix formatting