Manual cleanup from OJK