1) Removed some redundant class files.
1) Fixed a class definition that was causing warnings in some php versions regarding strict standars.