Remove debug and extra planning step