code cleanup
implement to new yimaSettings feature