Get rid of useless class (castlewall)