Again code cleanup.
Gregory - PLEASE DO NOT MESS UP PORT AGAIN!!!