Refactoring and removal of deprectateds.