Completely remove unused code