cleanup of checkbox datahandling