Merge "remove dead/usnused code"