* Cleaned up default modules