removed commented code
merging