remove unnecessary vars