Removed TODO stubs, extraneous comments, general cleanup