Class/method cleanup