Fix crash on first launch

Also get rid of debug statements to make publish ready