removing deprecated junk