Merge "Remove old code for Juno compatibility"