Removed some unused modules