Removed commented leftovers.