fix cycle
cleanup cycles