renamed properties holder that was confusing the code
removed dead code