Some cleaning up in CrudAction