Removed PEAR from classes