cleaning stuff
more cleaning
Merge branch 'sybil' of https://github.com/euba/BacArena into sybil