add return check and disable unused modules