remove some useless temping (not sure if it's needed at all, but lacks tests)