Cleaned up and removed unused modules