Initialized a big cleanup of this repository, removed duplication
Removed beaver support (so we can cleanup this repository)
Seems like this is deprecated