Remove unused package private classes