Stitched up cleaned classes to make them work properly without the usless
methods and properties.