Commented code, should be removed?