Merge "Code Clean up: remove type from <>"