Moving files around to remove bman prefix
Removing unused variables