Remove println and add sanity-check