All seems to be fine now. Few classes need to be cleaned though