Removing all unused code