Remove left-over defines.
Remove TODO stuff.