Fixed/deleted modules failing lint checks