#2393 and removed not needed module