src cleanup