clean up formatting
remove extraenous commented-out source files