Removed Commented Out Code