Clean code and remove unused bootstrap