Bridgeport Cleanup

* indicates required