Removed some dead code. Reformatting.