Deleted some unused classes and methods, added some logs.