Clean up unused modules and code