changes to remove unused code