Removed some unused code, added comment