Since we are still not done with the project and many other people need to merge stuff in, even though the catches probably won't get hit, I think it is a good idea to keep them in the mean time for debugging purposes, don't feel like this should be an issue right now.