Remove two lines, add a few others

seeing if it works