New modules and remove custom block