Add port, remove unused class.