removed non-applicable todo
some cleanups
cleanup in gl diff