Merge "Removing legacy compatibility layer."