remove unused class & methods