big src cleanup