removed som commented code and couts