remove unused code
fix conflicts