removed commented code not needed anymore