Improvement : Elimite all checking code.