Merge "remove code not in use" into experimental