Added PHPDoc blocks and removed some unused code in bootstrap