Fix binstubs
Cleanup configuration