Remove debug option, closes 16, closes 18