remove old class
remove unnecessary import
remove unnecessary cast