Start of object validation cleanup