Dependency on bootstrap removed