remove old CASL code; fix bridge locations