Added 2 EPUs and cleaned up database