Merge "Remove broken not used code"