boostrap cleanup, just commented out