remove unused code
Merge branch 'enhancements'