Remove depricated variable definitions