Merge "Remove obsolete Liberty code"