get ride of unused/commented code, mark some properties and method as @deprecated