cleanup unused code
Start internal variables with m_ prefix