remove old code
fix default so it works