Remove unused define and empty lines