Removed unused modules for now. Will resurrect them when our build are more stable.