#65: removed unused stuff for version1.0
#65: removed unused stuff