Updated packages and removed useless class.