cleaned up. only modules left. ready to be cloned