Fix formatting and remove other dead stuff