Further cleanup of src