[IMP] Improved code and remove the redendant methods.