#13 Removed port portions of the code