[-] Removed unnecessary class and refractored code[CAD]