Cleanup and the check is working now