Initial work on cleaning the camp filtering