Removed some commented out deprecated lines and a todo statement.