Cleanup of comments an TODOs. Documented @Ignore.