removed unnecesary objjects and fixed database issues