Tidy up enum sets

Remove enum set references from main .c file - these were previously
sent over to .h file.