tweaks for prepare specs
axed old remove modules, fixed up android handler specs.
fixed blackberry specs