Merge "Remove Manager class"