removed strict and unused