Fixing checkin process.

Most fixes applying to bug #331 - Checkin processing not working as
expected.
Removed redunant categories