Fixing and removing duplicate Application files.