Removed unused references
Added Bootstrapper interface