Removed module dependencies