system module code cleanup
network module code cleanup
model module code cleanup