a little clean up and dont build wappushmanager