Cleanup depricated methods