Remove useless checks: not needed for this reusable app