clean obsolete code
new version