** Removed commented code