cleared legacy code
Fix #5