remove depricated, tidy and rename