Removal, part one
Rename, part two
Fixing non-default port commit