Remove bootstrap, improve performance