Add descriptions and remove unnecessary modules