massive updates to remove custom code