Bootstrap files clean
Merge pull request #972 from sexnothing/develop

Bootstrap files clean
Code cleaning