Bootstrap fix

Includes removal of Database components