Cleaning up validation, groups done