Remove goal in place of #13