Removed unused modules and variables