remove comments and add goals