Remove optional database service and remove comments