refactored the code. removed unused classes from utils classes.