Remove unused former classes