Some unnecessary class paths removed.