Fixes

Remove debug code, fix remove buttons on configuration screen