remove remaining vars