Cleanup

Some cleanup to ghost ships