Grand Haven cleanup

Grand Haven cleanup