remove unused modules; fix namespace issue.