Fix: Removed unnecessary modules