Put the proper qualifier for debug info. Removed unneccessary not needed files.