Removed two methods from interface and replaced use of clean method in
abstract function class