Cursor: minor cleanup, remove unused xml, closes #113