Removed bs2 specific stuff completely