Erase debugging codes; Add validation to port