Deleted commented out code post v.0.6 release