Code cleanup, removed unecessary debug info. Release candidate for 1.0.