Remove code garbage and optimize the code
Merge https://github.com/fenggee007/fedorabk