Removed unneeded commented lines, added comment about future implementation.