More formatting and removing unused stuff.