Removed commented old code