Bye bye unused class