Merge "Removed unused methods"