removed unused method
merge from origin