Cleanup code and added active issue state.