Cleanup code #1320