Removed commented code after successful testing