Removing unused code after