Remove comments and update port property
Remove description
Merge