Cleanup code to remove eclipse warning.