Fixed sampling
cleanup