Cleaned and modified bootstrap

Removed some functions because they are now being handled in different
ways