Removed dependency of EdpDiscuss + fixed database sql file