Removed commented piece of code
Updated classes to fit PHP5 inheritance