Removed unused modules and classes