Delete unnecessary Classes by @Sharif