Deleted the questionable line from the last commit to make the code cleaner. Again, everything seems to be working. Manual testing done in sim.