Remove old code
Fix port