done. I was basically just trying to get the new feature out and did not pay attention to having a clean codebase. you're absoultly right.