resolve merge conflicts
deleting deprecated stuff