Yellow generic bug resolved and generic module cleaned