- Removed bsp stuff from this branch