[4.2] Database : remove unused code